From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Oct 2003 00:49:04 +0000 (+0000)
Subject: (ccl-decode-mule-utf-8): Lookup
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~25329
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=22c7773117cad61695854f96b105a81f56d37df9;p=emacs.git

(ccl-decode-mule-utf-8): Lookup
utf-subst-table-for-decode even for U+E000..U+FFFF.
---

diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 85bdae7ac64..54f6633ce42 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -448,12 +448,19 @@ default.  Also, installing them may be rather slow."
 
 			    ;; mule-unicode-e000-ffff
 			    ;; Fixme: fffe and ffff are invalid.
-			    ((r0 = ,(charset-id 'mule-unicode-e000-ffff))
-			     (r3 -= #xe000)
-			     (r3 //= 96)
-			     (r1 = (r7 + 32))
-			     (r1 += ((r3 + 32) << 7))
-			     (write-multibyte-character r0 r1)))))))))
+			    ((r4 = r3)	; don't zap r3
+			     (lookup-integer utf-subst-table-for-decode r4 r5)
+			     (if r7
+				 ;; got a translation
+				 ((write-multibyte-character r4 r5)
+				  ;; Zapped through register starvation.
+				  (r5 = ,(charset-id 'eight-bit-control)))
+			       ((r0 = ,(charset-id 'mule-unicode-e000-ffff))
+				(r3 -= #xe000)
+				(r3 //= 96)
+				(r1 = (r7 + 32))
+				(r1 += ((r3 + 32) << 7))
+				(write-multibyte-character r0 r1)))))))))))
 
 	      (if (r0 < #xfe)
 		  ;; 4byte encoding